Attempt at fixing behavior of previous commit on phones