Fixes Issue #536