fix to prevent loading of data every time
fix to prevent loading of data every time