fix return type to include null