Right fixed issues for real this time