add for beetle support