Fixed bug?
Merged