Fixed expr not working properly. Fixes #28