#11 bugfix
#11 bugfix v-up