Bug Fix

Fixes CRAFTERCMS-128