quick fix for issue #267