Revert "Fixed issue with bonus arrangement (fixes #145)"

This reverts commit 174d9187b4bc0aa1d860b38d013cdf940c9fadcb.