fixed bugs on arm