Quick fix for Issue#6