fixes for current data