BST Fix attempt 1