Removed dependency for mori
Fixed code