Jakub added fix for bug on card-459

https://trello.com/c/oU7gJbq0