Bug Fix (1.015)

Fixed one line of code which potentially end in bugs. Pushing to both
master and development.