Works in both client and server on 0.9