Support for JPM (workaround)