Crude and very repeat yourself solution fo #563