Cleanup solution to #120 [INSERT or IGNORE broken on Android version]