Fixed issue: Did some checking better. Thanks to @nike-17, @marklocker and @birkir