Fixed some issue with @jakub