Fully fixed #4