Changes for issue #420 (needs to be verified)