Awww moment, fix issues...