attempt to make work on 4.1