Fixes Issue 145