Fixed issue MR-352 by rmcardle