bugfix to commit 163eaf4