Fixed compatability with latest android support library