Fix for issue #467 and partial fir for issue #455