Again a fix for earlier Android versions