need to fix release mode Bugs.... :{