Bugfix: #46