Bugfix: #1