Strict variable fix