Fixed a rather serious bug that demanded loads and loads of redraws