Dirty Fix to avoid an backtrace, need further investigation