Fix for #215 and some other related improvements

This is unnecessary, constant has exactly this value