Solves issue #2 and #3