Fix problem with 4edbf93