Hacky method for dirty fix