Fixes Issue 242