Fix for issue 3 and 7