fix for issue #2, or least i hope