Use operator instead of partial - closes #143