bug fixes 14-10-2014