#14 Fixed. Added debug