Fixed Issue#282