Trying to fix that annoying bug >.<