Ok - I REALLY fixed it this time... seriously