#58 Fix issue with nullable type in current expression context