[#7] Bugfix