fixed some issues with my last diff