Bug Fixes

Refer to emaild ated 27/12/2013 18:08