Fixed migration to SDK 19