hot-fixed check for old data & corrected indentation