maybe fix app crash when watch
hoge
uheee
hogeeeeee
maybe works
Refactored