added more robustness... kinda