Fix problem again