Finished bugfix #691