Fixed bug and merged