Fixed bug(maybe?) :)