Fixed fromJust bug (needs refactoring).