Bug fix to patch 1.2