Bug fix for Issue #1456. going to test it in SlatwallTest