Fixed issue with bonus arrangement (fixes #145)