Fix to previous fix.
Authored by: James Williams 2014-07-24
Parent(s): [e4ea32]
Child(ren): [01049f][113589]