Fix 151

Fix for blocker #151