Hopefully final modification for SDK 21