Fix for Issue number 7