Another try at a fix for wrapping