Got it working properly again