Build failure fix

must be applied after #106