Fix bug in the last fix *inceptiooon*