bugfix commit 44cacb8