good fixes, hope this works