fix for commit 97dc48f