Fixes#3 WIP