Quick and dirty fix to make things run smoother