Bugfix: Fixed #15