Tested on 4.0-alpha