Merge bug fix. Yet another wrapper issue..