Fixed bug.
Ready for testing(4)