Should now work correctly on all activities