another attempt to make this thing more stable