Fix for preindication, maybe doesn't work