Bug concerning predefined variables fixed