Dirty quick fix for issue #20