Fixed Issue#51