Quick fix for issue #50