Bug Fix STAGE 2