Bugfix #12 - 50%