This Fixes #1028

Took care of the message