Possible solution to bugs