Fix Issues https://github.com/CoronaCore/Issues/issues/36

NOTE:
  * Not tested but must be work feedback welcome.
  * Note to me self replace condition 446 with other.

Signed-off-by: Salja <salja8840@gmail.com>