Minor bug fix fore Prepare