Fix for BUG 410