Seems to be working properly now