Probably solved #425