Bug Fix STAGE 1