There has been a stand-off at French Polynesia's prison where four inmates climbed on top a eight-metre high wall.
The four had refused to return to their cells amid complaints about the conditions at the Nuutania jail, which is known for being one of the worst run by France.
After negotiations they surrendered and two of them were taken away into psychiatric care.
Nuutania is notorious for being overcrowded and several former inmates have been paid compensation for being held in sub-standard conditions.
A new prison on Tahiti is due to be completed in 2017.