Fixed bug in last commit
Merge commit '93435737782980a62cf9bcfb7411240e87810fa5'