new attempt for better fix