Updated from commit 6cb51d8