quick fix for strange bug TODO