Fix #1313

This solves -> http://eden.sahanafoundation.org/ticket/1313

vishrut009