Fix for former commit