Resolved bug, finnaly