Fixed issue number 3, not tested though