Actually fixed previous bug