Fix for Issue#308 - Reverted back changes accidently made