Fixed bug~~ should be working properly.