BUGFIX for commit 5c5a8b9