BUG: Fixed references