Working towards 4.1 compatibility