Fixed to work with beta