bug fix
Merged bug fix
Finished for release 2