Made it compatible with SDK 1.6