Fixes #132 and "fixes" Phone glitch