Fixed commit b9ed655f