Fixes Paper

close HypatiaStation/HypatiaStation#213
close HypatiaStation/HypatiaStation#204