crack at bugfix