Fixes #126
-Probably can be improved.