Should fix a bug :|