Version 2 bug fixing