Bug Fixes - Refer to email dated 29/12/2013 1707