Fixes Issue #502