Tested with 4.1-alpha