Fix issue 463

This is a final fix for issue 463