Not sure if bugfix, need phone to check