Fixes #995
rebased onto f46edad38f20580311db19e268eb398febea73ec
rebased onto 4fe153be21f5d75d0022df93cb94cc6452a57c0d
Pull-Request has been merged by mohanboddu
Fixes #995