this time its fixed for real