Fix for issue 1. Will check it out when i have an IDE