Make it work with poseidon master