Fix problem with normal variables