This actually fixes a bug :->