Continuation of commit 56cfd2a