Fix #260 build behavior