Temporary fix for wrong commit 8c595bf