intermediate fix (quite working)