fix: #133, #418, #400

#133 It's just a hack...