Fixes #2 back port from 3.0