Fix SPOUT-241

signed-off-by: Snaipe franklinmathieu@gmail.com