Added minimum size, to be fixed to correct size
Merged with Austin