Fixed commit 582e867