BuxFix #7