added some stack checks