Fix154

Fix the majority if #154