Unwired code related to #126
Fix #125