Fixing minimal bug